From: Miles Bader <miles@gnu.org>
Date: Mon, 7 May 2007 01:09:35 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18928
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cd7ed4c0f2137f7eba8931d198791844ff9a6e00;p=emacs.git

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 9-10)

   - Update from CVS

2007-05-06  Richard Stallman  <rms@gnu.org>

   * lisp/emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix.

2007-05-03  Ryan Yeske  <rcyeske@gmail.com>

   * lisp/net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted
   disconnections.

2007-05-06  Richard Stallman  <rms@gnu.org>

   * lispref/processes.texi (Accepting Output): Revert most of previous change.

2007-05-05  Richard Stallman  <rms@gnu.org>

   * lispref/processes.texi (Accepting Output): accept-process-output
   uses microseconds, not milliseconds.  But that arg is obsolete.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-734
---

cd7ed4c0f2137f7eba8931d198791844ff9a6e00
diff --cc lisp/ChangeLog
index 46037289df3,7c0df4a4d36..28b4afb9d93
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,26 -1,12 +1,35 @@@
+ 2007-05-06  Richard Stallman  <rms@gnu.org>
+ 
+ 	* emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix.
+ 
 +2007-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* diff.el (diff): Use buffer-local vars diff-old-file and diff-new-file
 +	rather than storing their value in the revert-buffer function.
 +
 +2007-05-04  Nick Roberts  <nickrob@snap.net.nz>
 +
 +	* t-mouse.el (t-mouse-mode): Do nothing on a graphical display
 +	when disabling t-mouse-mode.
 +
 +2007-05-01  Davis Herring  <herring@lanl.gov>
 +
 +	* calendar/timeclock.el: Update version number.
 +	(timeclock-modeline-display): Mention timeclock-use-display-time
 +	in explanatory message.
 +	(timeclock-in): Fix non-interactive workday specifications.
 +	(timeclock-log): Don't kill the log buffer if it already existed.
 +	Suppress warnings when finding the log.  Don't check for a nil
 +	project twice.  Run hooks after killing the buffer (if applicable).
 +	(timeclock-geometric-mean): Rename to `timeclock-mean' (it never
 +	was geometric).  All uses changed.
 +	(timeclock-generate-report): Support prefix argument.
 +
+ 2007-05-03  Ryan Yeske  <rcyeske@gmail.com>
+ 
+ 	* net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted
+ 	disconnections.
+ 
  2007-05-01  Romain Francoise  <romain@orebokech.com>
  
  	* dired-x.el: Revert 2007-04-06 change.